Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes Cocoons #1169

Merged
merged 1 commit into from
Nov 2, 2024
Merged

Fixes Cocoons #1169

merged 1 commit into from
Nov 2, 2024

Conversation

FoxxoTrystan
Copy link
Member

Description

This PR fixes the cocoon muffle issue and also add a "uncocoon" feature for cocooners to use.
This also add icons on cocoon and fixes a butcher variable.


Media

image
image


Changelog

🆑 FoxxoTrystan

  • tweak: Cocooners can now freely uncocoon any cocoons without the need of a sharp object.
  • fix: Cocoon making you stuck in muffle accent.

@FoxxoTrystan FoxxoTrystan added Priority: 2-High Needs to be resolved as soon as possible Size: 4-Small For small issues/PRs Type: Bug [Un]intentional issue with something labels Nov 1, 2024
@FoxxoTrystan FoxxoTrystan requested a review from a team November 1, 2024 16:26
@FoxxoTrystan FoxxoTrystan self-assigned this Nov 1, 2024
@github-actions github-actions bot added Changes: C# Changes any cs files Changes: Localization Changes any ftl files Changes: YML Changes any yml files Status: Needs Review Someone please review this labels Nov 1, 2024
@FoxxoTrystan FoxxoTrystan added Status: Awaiting Merge 2 or more maintainers has approved this PR and is now awaiting merge and removed Status: Needs Review Someone please review this labels Nov 2, 2024
@VMSolidus VMSolidus merged commit 3bbcab8 into master Nov 2, 2024
20 checks passed
@VMSolidus VMSolidus deleted the the-webs branch November 2, 2024 02:21
VMSolidus pushed a commit to VMSolidus/Einstein-Engines that referenced this pull request Nov 2, 2024
WarMechanic pushed a commit to WarMechanic/Einstein-Engines that referenced this pull request Nov 9, 2024
* glacier real

* troll

* atmosia tweaks

* 1 less can of plasma not too op

* replace troll generator with solar crate

* add StationSurface to glacier

* add surface map

* biome stuff upstream #28017

* unpause after loading

* fix no terrain

* comment out the surface spawning

* shipyard

* glacier justiceroid

* updateprototype and cleanup

* fix random shit

* untroll

* courier

* add to test :trollface:

* fix

* futureproofing

* hot loop inlet lmao

* tweak some pumps in atmosia

* carpy and make salv locker lighting better

* Edit lights, move salv dock, add justice maints, edit entity names for
casing consistency, other minor edits

---------

<!--
This is a semi-strict format, you can add/remove sections as needed but
the order/format should be kept the same
Remove these comments before submitting
-->

# Description

Ports Glacier from DeltaV. Justice department has been yeeted.

# Changelog

🆑
- add: Glacier Returns.

---------

Co-authored-by: deltanedas <[email protected]>
Co-authored-by: Velcroboy <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: C# Changes any cs files Changes: Localization Changes any ftl files Changes: YML Changes any yml files Priority: 2-High Needs to be resolved as soon as possible Size: 4-Small For small issues/PRs Status: Awaiting Merge 2 or more maintainers has approved this PR and is now awaiting merge Type: Bug [Un]intentional issue with something
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants